Assignments from project edit working. Reorg'd files to be more modular.