Reorganised src directory