Re structured objects and general code arrangement