Updated src files for moving to GitHub