Cleaned Up code hierarchy and Updated README.md