Change directory structure to be more sensible