reorganize the app modules in separate directories