changed package and moved main stuff to seperate directory