restructured source folders