Changed file layout and updated parser accordingly