moving stuff around and doing some cleanup