tidied up directories
reorganized directory structure, setup test directory