Removed underscore from folder structure to allow it to compile nicely under Eclipse.