Moved views out of lib