#20 Moved app folder do main folder