Reorganised codebase a bit