Restructure for better management