Cleanup of file structure
Updated Readme