Initial working version + packaging rules