Adjust source code structure