WIP: Include "common" repo and remove redundant files