Move directory structure + make compile

Standardised the wrong-headed directory structure.