moved app from subfolder to main folder & updated the models