Restructure and cleanup targets.py for easier navigation