Small organization and file naming changes. Improvements to styles.