Re-organise repo D:

This is no doubt bug ridden