Revert "Re-organised"

This reverts commit 5ed03751c3dc9c52d6c293903633c0d338b5cb99.