Updated changes

Entire data shifted to data directory.
Naming convention changed.
Annotation naming done dynamically.