A bit of refactoring. Came up with a simpler and cleaner file structure under mysql.