cleaning up the kotlin files into their business domain