almost done fixing conventions
removed duplicate proprietary folder