changing directory structure in the code; adding test directory