Moved directories around for easier code interpretation