Splitted and namespaced the original classes