fix for bug #697

rearrange entries
clean up code
move gen.core.filters.Option.java into separate file
clean up code
clean up code
clean up code