fixtures data added, some file rearrangement