Reorganized directories for better file management