initial commit
move the main class
small modiefies