File re-jig and adding 'Sign out' feature