reorganised directory structure