Annotation Tools: Finished restructuring and Permissions Fix