restructure
added initial code for custom planner