Cleaned up directory structure to organize files cleanly.