Constants coverted to singleton. Compressed file reduced to contain only the missing libraries