reorganize and remove unneeded files