Moving stuff back into separate directories