enabled simple test and rearranged file structure