refactor(fromJson/toJson): move the contents of these files into Angular.js

these files are now mostly empty so it doesn't make sense to keep them
separated from other helper functions