Moved the classes to the appropriate folder. Preparation for the
release but I don't know how.