generalised methods

all static methods from scraper.java now non-static, moved to
Company.java
more generalising