reorganized directory structure, added test files