Changed filestructure and updated Readme