Moved stuff into the right directories