Improved the development structure