Rearranged files. Working version