Reorganization and main app done