Reorganization of files from users branch