moved jobs to under companies. Some style changes