Adjusted include paths
Major structural overhaul