Support packages + file watch

I'm still testing, please review