Adding spec and a possible change in directory structure