Moved everything over to 'concepts' now that most of the PRs are merged. Also worked on io.socket.* stuff