Reorganized CSDEF and removed some unnecessary keys
Fix code analysis errors and add Google Analytics info