Organize everything nicely and add dist builds