Fixes

Removed old .sql, fixed capitalization on the new one (caused problem on
*nix systems), updated includes to the new architecture.