removed pointless files and a little restructure