Moved stuff to now compile as runnable jar