Refactorted LaneStack etc to new repo layout