Align spec folder hierarchy with lib folder hierarchy