Reorganized, removed src/ directory