refactor(app wide): Overall restructure of files