project refactored
point to new locations
finish integrating functionality