Reorganized the project a bit so that it's manageable in eclipse