Move cmake files around
Fixed for better build cmake