Rearrange to be able to checkthis out inside a project on it's own