Use case that matches java convention
fix run.sh
various cleanup stuff
seperate classes into own files