Changes in folder structure, updated readme