Adding new helper classes, restructuring project