Restructured source directory