naming convention and directory structure update
Code cleanup