Added new folder structure and complete UM APP