Project cleanup
Remove references to deleted files, resolve warnings
Rename layers
Merge branch 'master' into fsharp-dev