Removed some POC code and moved it into the core libraries
Changed names