Structure changes + readme updated