Updated project structure and included DateVal