Cleaned up directory structure. Improved Readme