Final Commit, changed class paths