added local running constructor param
moved classes to separate files