fixed dependencies in code
gave up on window.org.* in advantage of org.*