Updated Readme
Updated basic structure
some restructuring