Revert "Revert "Reorganised into feature folders""

This reverts commit 90f8af7fd75d9e3cd442e87b2db76b99f36165e7.