Restructure dirs. Fix paths