Cleaned up directory structure