Update

Several files is updated, deleted and added