Cleaned up directory layout some more