Moving to different structure
Updating readme