Added Machine EntityComponent and settings, MachineFunction WIP. Minor refactoring and clenaup fof Entity and derived classes, moving functionality around. Cleaned up Action a bit