Readjust structure to fit new ideas ;)