Adding DAO Implementations, and Cleaning up the project