src dir restructured