Some simplification and classes renaming