Fix in-progress changes made before initial commit
Organise repo into two folders