Updated Src/ directory structure