removed and moved some files around