FAIMS-410: updating class paths
merging structure tabs
merging master