Source code re-organization