[ATLASV] - :fu: separate logic to different files