refactoring folders and app structure