Added comments, organized includes and classes in CIS