Re-organization of SQL-Files
More update
Removed underscore in 'Primary Key'
Fixed typo on conf/battle and cache/