Updated system paths to match design changes