Updating distribution exclusions
Refactoring test directory