Reorganised directory structure

To correspond to Python package