Refactored package architecture
Changed sequence notation to square brackets and commas
Refactored package architecture