moved code to subdirectory (required by JUnit bridge)