Move app-related files to app subfolder
Adjust namespaces to match directory structure