refactoring and file structure organization primarily for wall