Add JodaTime, FileUtil and clean up.