Move beardach components to better namespace