major refactoring re file and directory naming