Removed empty files. Added includes for query optimization.