Moving functionality to separate projs