Reorganize project

This project needed some updating and reorganizing.