File Cleanup + Dictionary Persistance

File Cleanup + Dictionary Persistance