Structure changes

I just saw the project and thought it will be nice to continue your work so here are some quick structure changes :)