Code cleanup and add file manager.
Code cleanup and add file manager.