moving stuff around and fixing links
moving around and files