restructure public/src directories