Restructuring project to support separate command-line utility