Remove bad dependencies, reoganize slightly