files reorganised and made more structured