some more cleanup, move around some resources files