Cleaning up and re-organizing of the structure