Restructing data, right now its somewhat confusing and no very easy to work with