Renamed folders so that namepsaces are correct