VFS: Split up User and Public module into separate files