fixes, restructuring, standalone jar