Fresh src files

These should work. It was Eclipse's problem, not Java's.