Restructuring the app to proper folders