Restructured directory layout and updated all namespace referencing.