Code organisation
Update README