Move to app subdirectory?