further fixes on the refactoring, and trying to figure out why my app cant seem to see 2 folder levels deep when wiring states.