fixing numerous rebase issues to make compile

eclipse had serious issues compiling; turns out it needed a new project
made by maven in order to have correct build paths