Remove example, add new classes