Restructure the project a little