File reorganzation, added helper submodule