chore(*): Revised structure and build for new approach