Added UnderConstructionActivity
Full Clean Up and refactoring with APA template
Renaming for few resources