Modularized the project a bit in terms of organization