moving stuff into appropriate folders properly