Updated dir structure and added test package