Cleaning up the dir structure; added test manifest