Updated paths to reflect organization.