Cleaned up file structure and updated Readme