Oops, moving java classes back to appropriate directory