restructured source directory