move DTO location
fix up folder structure
fixing errors from the refactor