Refactored package types into their own directories
Added support for directory packages