reorganized on App folder.

lamat dams!