Uku refactoring

Just organising some of the existing functionality.