Re-arranged the packages for different component classes.