reorganizing files into folder, adding separate file for tests