Setting up multiple package dirs
Setting up multiple package dirs/Fixing misc rewrite issues