moving to add inits, being more consistent with module layouts