changing projects around even more
changing library paths to be more consistent