Changed project structure

I removed an unneeded directory level and included the Eclipse project files in the repo. After these changes, you should be able to delete your existing project and re-import, this time choosing "Use existing projects". If that works for you, let me know and we can try setting up another repo.