Renamed packages & Rearranged train definition to avoid circular reference between packages