Title: Recomposition of the class strcuture