Fixed some dependency and folder structure nonsense.