Re-structure to conform to hexagonal architecture pattern, pass one.