renamed classes and moved to correct package
set correct mainclass