Source code layout reorganized