Refactor src/ modules and build + packaging process

I wonder what's going on here that the new entry has a `1` right in the middle.