Updates to clean up structure

Updates to clean up structure