Changed the project structure, added Automation changes.