[Refactoring] Move classes in a better folder