cleaning up folder structure, thinning dependencies