Refactored directory structure
Refactored directory structure and changed structure of layouts of the annotation screen