Refactored the data access. Organized files better.