Organise files in sub-packages