Cleaned up directory structure, files