Organize imports, refactored all apps lists