another restructuring... was not amused with the whole folders... even if it's standard.. my prototype is a hack^^^