Made changes and re-organized dataconfiguration stuff