re-arranging and re-naming some files for clarification