Revert "Had to fix a bunch of stuff up, eclipse source file got mixed up"

This reverts commit 9719fb211010a56da1bbd6fb01df2904531af0fa.