Include move, copy and delete functionalities, updated structure according to standards