Fixed some organizational issues from previous commits