Improved file structure.
Updated Readme