cleanup and move some resources into a more logical place;