Organize the source code