Renaming/Cleanup

Renamed some classes cleaned up vowel counting strategy