Inline with carbon dev
Clean directories a bit