Code renaming and re-organizing