Adopt new app directory structure