Change organization in modules for each function