Directory restucture and fixed tests