Code organization

Thanks kll for your perseverance.