Restructure folder organization