Moved sources

So that dev and build workspaces match