Updated project hierarchy and fixed broken installer
More clean up
Exception handling in automaton