Fixed src/ structure