Cleaning up and organizing

Started some clean up stuff, and working out a system for consistency.