Rename files and adjust structure