- reogranized project paths to be more logical