Cleaned up some block renames and added a task to move files into a namespace