Moved some files around, removed debugging code