small reorganization

not that "first-in-time" code was locked - this should be handled in a
faster aproach