Implementing changes from Karin. Cleaning up files in src.