Added new folders and rearranged component classes.