Moved Space to internal.space
Working on ui