refactoring/adding files for utilities
more cleanups, more fun.