Start refactor which will include dependencies