Restructured src to include only source code