Cleaned up directory layout