Better folder organization for future module's sake