Changed structure to match 3dpca branch

Changed scatter and pca structure to match 3dpca branch.
Keeping two versions close as possible to minimize maintenance
requirements