Restructured packages and added target identification to Python script.