moved some files and removed unneeded files