Update project's directory structure

Updated the directory structure to follow the common practices