Restructure for pretty development