Changed the organization of this project to not be dumb.