Refactor and Clean Up Structure and Naming.