Revert "Reorganised into feature folders"

This reverts commit 9c944a0e3fccfb37db8160d53226f1deb3df679c.