Removed and moved some files