Bringing more into proper files from Ctesius