cleaned up directory structure, moved tests