Moved app directories under the project et al.