removed unneeded files, shifted things to the right places