Daniella cleanup

Post Daniella clean up… and file restructuring.