rearranged ptr and moe
moved manager to base class
cleanup