Final code organization