major restructuring
updated dist to push