Naming convention changed and some restructuring.