refactor(build): cleanup and restructuring