Renamed files, cleaned up some code. Added Channel class.