moved some more things over into essentials project