Changed file structure and slightly updated readme