#25 add folders to generator and rename spec to tests