[Refactoring] Move classes in a better folder
[Refactoring] Move classes in a better folder