Re-organize the effectivejava project.