Updates and additions

1) Code cleanup
2) New tags to store files and letters
3) Updated existing tags to better reflect design goals