Reorganised the directory structure, cabalised.