restructuing stuff...