Added proper support for .info file. General file cleanup.