Further cleaning, moved Contract files into their own folder.