Made a more sensible directory layout