Move folders
Update IOC
Split application
Update templates & console