Organized and refractored