Added Folder-Structure and minor namechanges