-	Moved some includes around
-	Made CLBaton generic