Style fixes
Handle package dirs correctly