Now installer works with new filename scheme.
Code cleanup and removed redundancies.