finished rearranging code and committing helper scripts