Refactored utils into own module; cleaned up makefile