Refactor to flatiron

# :construction: WIP :construction: