Organized Solution: Added Filters, and Include Files