Rearranged directory structure
Updated tests