Mass Organisation

Rename directories and move things around a bit.