Reorganisation of directory structure as preparation for the 0.3.0