Moved app into /app namespace