Changed file layout, clenaing up directory