Refactor src/ modules
Build