Cleaned up app dir structure.