Moving coffee files to /src
Fix all the uncoffee like things still left in