fixing execution path, extracted classes into own files for autloading