Restructured the project a bit to be more flexible.