Directory reorganisation, please read README.md