Moved stuff around

Now it should be a tidier folder all up.